tools: install qemu into xen private directory and add rpath for the libraries

This patch will prevent our qemu from conflicting with system qemu.

Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/tools/Makefile b/tools/Makefile
index 992fe3e8e8f9494823f5c9b962d4abef7bd11c25..63382b16e4cfbc19e8d124444901c45f79fe26f5 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -187,7 +187,9 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
        cd qemu-xen-dir; \
        $$source/configure --enable-xen --target-list=i386-softmmu \
                $(QEMU_XEN_ENABLE_DEBUG) \
-               --prefix=$(PREFIX) \
+               --prefix=$(PREFIX)/lib/xen \
+               --libdir=$(PREFIX)/lib/xen/lib \
+               --includedir=$(PREFIX)/lib/xen/include \
                --source-path=$$source \
                --extra-cflags="-I$(XEN_ROOT)/tools/include \
                -I$(XEN_ROOT)/tools/libxc \
@@ -195,7 +197,8 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
                -I$(XEN_ROOT)/tools/xenstore/compat \
                $(EXTRA_CFLAGS_QEMU_XEN)" \
                --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \
-               -L$(XEN_ROOT)/tools/xenstore" \
+               -L$(XEN_ROOT)/tools/xenstore \
+               -Wl,-rpath=$(PREFIX)/lib/xen/lib" \
                --bindir=$(LIBEXEC) \
                --datadir=$(SHAREDIR)/qemu-xen \
                --localstatedir=/var \